Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 16 Feb 2011 00:09:42 +0000 (16:09 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 16 Feb 2011 00:09:42 +0000 (16:09 -0800)
commit0a04267bdc1fca986bf0ddd5d65146becf4d1489
tree7c3e65bd4803966ff4135eef17164e7a366db998
parent6c0602472a074a3b13812d06499b2da6f0e77888
parent45e205a4ace921f17118e8bf324c13becb6f29fd
Merge from mainline.